From 8447a9ecd22d8c842f264c1c9856bf8b20f96112 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Thu, 23 Sep 2004 19:05:11 +0000 Subject: [PATCH] bitkeeper revision 1.1159.83.2 (41531e67elxwliWniLaHV5bOgAsyHQ) 2.4 migration fixes (config options were added to 2.6, but not 2.4, the result being that devices were not reconnected after a migration) --- linux-2.4.27-xen-sparse/arch/xen/config.in | 2 ++ .../arch/xen/defconfig-xen0 | 2 ++ .../arch/xen/defconfig-xenU | 20 +++---------------- .../arch/xen/drivers/blkif/Makefile | 4 ++-- .../arch/xen/drivers/netif/Makefile | 4 ++-- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/linux-2.4.27-xen-sparse/arch/xen/config.in b/linux-2.4.27-xen-sparse/arch/xen/config.in index d6a3936547..231612959a 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/config.in +++ b/linux-2.4.27-xen-sparse/arch/xen/config.in @@ -17,6 +17,8 @@ comment 'Xen' bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST bool 'Device-driver domain (physical device access)' CONFIG_XEN_PHYSDEV_ACCESS bool 'Scrub memory before freeing it to Xen' CONFIG_XEN_SCRUB_PAGES +bool 'Network-device frontend driver' CONFIG_XEN_NETDEV_FRONTEND +bool 'Block-device frontend driver' CONFIG_XEN_BLKDEV_FRONTEND endmenu # The IBM S/390 patch needs this. define_bool CONFIG_NO_IDLE_HZ y diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 index 21b0a99eab..fac68182d1 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 @@ -13,6 +13,8 @@ CONFIG_UID16=y CONFIG_XEN_PRIVILEGED_GUEST=y CONFIG_XEN_PHYSDEV_ACCESS=y CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_NO_IDLE_HZ=y CONFIG_FOREIGN_PAGES=y diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU index a975cc9f9f..c0445ac420 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_XEN=y CONFIG_X86=y @@ -13,6 +13,8 @@ CONFIG_UID16=y # CONFIG_XEN_PRIVILEGED_GUEST is not set # CONFIG_XEN_PHYSDEV_ACCESS is not set CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_NO_IDLE_HZ=y # CONFIG_FOREIGN_PAGES is not set CONFIG_NETDEVICES=y @@ -152,10 +154,6 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -188,20 +186,12 @@ CONFIG_IP_NF_TARGET_ULOG=y # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set @@ -313,10 +303,6 @@ CONFIG_PSMOUSE=y # CONFIG_INPUT_EMU10K1 is not set # CONFIG_INPUT_SERIO is not set # CONFIG_INPUT_SERPORT is not set - -# -# Joysticks -# # CONFIG_INPUT_ANALOG is not set # CONFIG_INPUT_A3D is not set # CONFIG_INPUT_ADI is not set diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile index 20c8192d3d..7474e71fb4 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile @@ -1,8 +1,8 @@ O_TARGET := drv.o -subdir-y += frontend -obj-y += frontend/drv.o +subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend +obj-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend/drv.o subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend obj-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend/drv.o diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile index 20c8192d3d..7474e71fb4 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile @@ -1,8 +1,8 @@ O_TARGET := drv.o -subdir-y += frontend -obj-y += frontend/drv.o +subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend +obj-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend/drv.o subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend obj-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend/drv.o -- 2.30.2